Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 15 Jan 2012 06:04:52 +0000 (22:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 15 Jan 2012 06:04:52 +0000 (22:04 -0800)
commit5e2b206c2b406fd888e22031f4e064e8375a43be
treee124fcc34d6d00647eda5b04668b29e45e333037
parentc39663cd92dd139aed820b2f4b187b88c3e11f53
parent2a5e4343fa809f96552e349e7bc410c321f0271c
Merge from trunk.